don't call module initializers multiple times. changed --gtk-with-module

Mon Aug 17 05:10:29 1998  Tim Janik  <timj@gtk.org>

        * gtk/gtkmain.c (gtk_init): don't call module initializers multiple
        times. changed --gtk-with-module to --gtk-module at owen's request.

diff --git a/ChangeLog b/ChangeLog
index 1c115cfc6a7a6e085f78bf095ff77a9a74343f45..70e31430683702ec7153f5dd3f6727c34563c632 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 17 05:10:29 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkmain.c (gtk_init): don't call module initializers multiple
+       times. changed --gtk-with-module to --gtk-module at owen's request.
+
 Mon Aug 17 03:47:55 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkmain.c (gtk_init): feature a new commandline option

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 1c115cfc6a7a6e085f78bf095ff77a9a74343f45..70e31430683702ec7153f5dd3f6727c34563c632 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Mon Aug 17 05:10:29 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkmain.c (gtk_init): don't call module initializers multiple
+       times. changed --gtk-with-module to --gtk-module at owen's request.
+
 Mon Aug 17 03:47:55 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkmain.c (gtk_init): feature a new commandline option

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1c115cfc6a7a6e085f78bf095ff77a9a74343f45..70e31430683702ec7153f5dd3f6727c34563c632 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Mon Aug 17 05:10:29 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkmain.c (gtk_init): don't call module initializers multiple
+       times. changed --gtk-with-module to --gtk-module at owen's request.
+
 Mon Aug 17 03:47:55 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkmain.c (gtk_init): feature a new commandline option

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 1c115cfc6a7a6e085f78bf095ff77a9a74343f45..70e31430683702ec7153f5dd3f6727c34563c632 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Mon Aug 17 05:10:29 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkmain.c (gtk_init): don't call module initializers multiple
+       times. changed --gtk-with-module to --gtk-module at owen's request.
+
 Mon Aug 17 03:47:55 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkmain.c (gtk_init): feature a new commandline option

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 1c115cfc6a7a6e085f78bf095ff77a9a74343f45..70e31430683702ec7153f5dd3f6727c34563c632 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Mon Aug 17 05:10:29 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkmain.c (gtk_init): don't call module initializers multiple
+       times. changed --gtk-with-module to --gtk-module at owen's request.
+
 Mon Aug 17 03:47:55 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkmain.c (gtk_init): feature a new commandline option

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1c115cfc6a7a6e085f78bf095ff77a9a74343f45..70e31430683702ec7153f5dd3f6727c34563c632 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Mon Aug 17 05:10:29 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkmain.c (gtk_init): don't call module initializers multiple
+       times. changed --gtk-with-module to --gtk-module at owen's request.
+
 Mon Aug 17 03:47:55 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkmain.c (gtk_init): feature a new commandline option

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1c115cfc6a7a6e085f78bf095ff77a9a74343f45..70e31430683702ec7153f5dd3f6727c34563c632 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Mon Aug 17 05:10:29 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkmain.c (gtk_init): don't call module initializers multiple
+       times. changed --gtk-with-module to --gtk-module at owen's request.
+
 Mon Aug 17 03:47:55 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkmain.c (gtk_init): feature a new commandline option

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 1c315b326207124044ed97ab7a54c49285eb82a3..19c6d2f79f23064fc7f0d213f79281284800f2ac 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -309,12 +309,12 @@ gtk_init (int      *argc,
                }
              (*argv)[i] = NULL;
            }
-         else if (strcmp ("--gtk-with-module", (*argv)[i]) == 0 ||
-                  strncmp ("--gtk-with-module=", (*argv)[i], 18) == 0)
+         else if (strcmp ("--gtk-module", (*argv)[i]) == 0 ||
+                  strncmp ("--gtk-module=", (*argv)[i], 13) == 0)
            {
              GModule *module = NULL;
              GtkModuleInitFunc modinit_func = NULL;
-             gchar *module_name = (*argv)[i] + 17;
+             gchar *module_name = (*argv)[i] + 12;
 
              if (*module_name == '=')
                module_name++;
@@ -339,7 +339,15 @@ gtk_init (int       *argc,
                  if (module &&
                      g_module_symbol (module, "gtk_module_init", (gpointer*) &modinit_func) &&
                      modinit_func)
-                   gtk_modinit_funcs = g_slist_prepend (gtk_modinit_funcs, modinit_func);
+                   {
+                     if (!g_slist_find (gtk_modinit_funcs, modinit_func))
+                       gtk_modinit_funcs = g_slist_prepend (gtk_modinit_funcs, modinit_func);
+                     else
+                       {
+                         g_module_close (module);
+                         module = NULL;
+                       }
+                   }
                }
              if (!modinit_func)
                {